Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Bump polkadot-master#3894

Closed
expenses wants to merge 18 commits intopolkadot-masterfrom
master
Closed

Bump polkadot-master#3894
expenses wants to merge 18 commits intopolkadot-masterfrom
master

Conversation

@expenses
Copy link
Contributor

Hello, I need to be able to make a polkadot PR for #3857, but polkadot won't compile with the current master branch of substrate so first I need polkadot-master to get updated then paritytech/polkadot#490 to get merged. Having to do things this way is a bit annoying. Perhaps if polkadot used a submodule of substrate instead of relying on this polkadot-master branch things would be easier.

bkchr and others added 17 commits October 20, 2019 13:02
* Change DefaultMaxDepth from 1024 to 32

* bump impl and spec version
* use ThreadPool to spawn_worker()

* use ThreadPool to implement spawn_worker(fn)

* use ThreadPool to implement spawn_worker(f)

* update [dependencies] threadpool and num_cpus version

*  rm 'extern crate num_cpus'

* cargo.lock update

*  merge the newest cargo.lock

* Update Cargo.lock

* use Mutex to wrap OffchainWorkers.thread_pool

* format use crate

* use parking_lot::Mutex instead of std::sync::Mutex
* Update impl-serde to patch RPC.

* Add test.

* Fix long line.
* parse decl_storage getters with fn keyword

* test for get in decl_storage

* update all decl_storage! getters

* bump version

* adjust missed doc line
* refactor map macro for more general use

Signed-off-by: yjhmelody <465402634@qq.com>

* use $(,)?

Signed-off-by: yjhmelody <465402634@qq.com>

* Update core/primitives/src/lib.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* Update core/primitives/src/lib.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>
* Remove sr-arithmetic/fuzzer from workspace to fix windows builds

* Remove sr-arithmetic/fuzzer from check_runtime.sh
* Implement Printable for tuples.

* Add debugging function.

* Add debug 1.

* Implement  for everything.

* RuntimeDebug derive.

* Introduce RuntimeDebug.

* Add some dummy logging.

* Replace RuntimeDebug with Debug.

* Revert "Replace RuntimeDebug with Debug."

This reverts commit bc47070.

* Working on Debug for all.

* Fix bounds.

* Add debug utils.

* Implement runtime logging.

* Add some docs and clean up.

* Clean up derives.

* Fix custom derive impl.

* Bump runtime.

* Fix long lines.

* Fix doc test.

* Use CARGO_CFG_STD.

* Revert "Use CARGO_CFG_STD."

This reverts commit ea42956.

* Use parse_macro_input

* Update lockfile.

* Apply review suggestions.

* Remove stray re-export.

* Add no-std impl.

* Update lockfile.
* gossip: futures 03 receiver

* fix gossip test

* use tokio 01

* add comment

* Update core/finality-grandpa/src/communication/mod.rs

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* fix format

* rename

* remove tokio 01 runtime

* minor fix

* make stable happy
* Wasm-builder-runner unset `CARGO_TARGET_DIR` and release 1.0.4

`CARGO_TARGET_DIR` needs to be unset or otherwise cargo deadlocks,
because cargo always holds an exclusive lock on target dir.

* Commit missing version up

* Lock file
@expenses
Copy link
Contributor Author

It turns out that I do not need to make said PR, however it would be good to keep polkadot-master updated.

@bkchr
Copy link
Member

bkchr commented Oct 23, 2019

We update polkadot-master, when we prepare a pr for Polkadot. This is not the best workflow, but the best we can do currently. Also we just update the branch by pushing to it, so I will close this pr for now.

@bkchr bkchr closed this Oct 23, 2019
@gui1117
Copy link
Contributor

gui1117 commented Oct 23, 2019

see the polkadot part in the guidelines https://github.com/paritytech/substrate/blob/master/CONTRIBUTING.adoc

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.